Fixed small merge fail :)