endpoint fix & orientation axis fix