Improved robustness of axis implementation