Qick & dirty fix for #2836
Merge pull request #2898 from lovasoa/patch-2

Qick & dirty fix for #2836