Bugfix in last commit