Attempt to fix Octave interface, #554