Bugfix caused by the last commit