Corrected merge error

Should have done a compile check, obviously...