Bugfix from previous bugfix ;)