Gabriel Aubry has agreed to attend anger management classes after being investigated for child endangerment by the Los Angeles County Department of Children and Family Services. Aubry met with the department Friday of last week after an alleged scuffle took place with his daughter’s nanny.

The 36-year-old model, who has a three-year-old daughter named Nahla with actress Halle Berry, is alleged to have pushed his daughter’s nanny while she was holding the toddler. Aubry has denied pushing or laying hands on the nanny.

Although 45-year-old Berry has gone to court to have a restraining order put on Aubry, as well as asking for full-custody to be granted to her, a judgement will not be made until Monday.

Berry and Aubry have been to court multiple times since their separation in 2010, battling custody issues. It is rumored that Berry and her boyfriend, 46-year-old actor Olivier Martinez, became engaged in January, but the couple has not confirmed the engagement.