Fixing axes compatibility.

Just that... merging it soon to make available in the devel build.
Fix #1012