Merge pull request #3584 from diizzyy/patch-23