Bugfix with last commit