Bugfix for last commit...