Fixed infinity loop and missing axis issues