Created by: tader
Fixes for this issue fixed other places than the wiki where I was actually experiencing the problem. I hope this will fix the issue in all places without braking anything...