Bugfix from last commit