Fixing axis order handling