Fixes stuff for @xbony2 ;)