Corrected implementation of angular support