Merge pull request #2339 from diizzyy/patch-1