Merge pull request #4228 from diizzyy/patch-44