Draft: Fixed PropertyAngles - fixes #1451