Fixed an old merge conflict that broke something