Fix merge error (thanks to giordano!)