This should be a bugfix but isnt :D