Fixing angle calculations, #42