Bugfix of the bugfix :P