Fixing bug, wouldn't have passed my testing...