Incorrect short-circuit when fixing for Octave
Closes #161