One more thing that the merge messed up! ;)