Switched to using axis.number instead of string comparisons