Fixed a small issue with final angle