Get rid of damn angle mess