Bugfix for last commit