Angular bug fix