Fixing badly broken previous commit (damn laziness)