Fixing BR #188. This might fix X Errors (BadDrawable) aswell