improved Octave compatibility