Bugfix for the last bugfix :|