Fix #1472
Revert "Fix #1472"

This reverts commit 73349efeec2930a94d753812d779cc2ce304192d.
Fix 1472
Revert "Fix 1472"

This reverts commit 078dea83bb084234cd1f6a5e3a97616614635640.
Fix #1472
Merge pull request #1482 from Naththo/fix1472

Fix1472