Octave 2.0.16 compatibility.
Removed static declarations - gave wrong results.