Bugfix to previouse commit