Fixed the axes issues