Chris Brown has been ordered back to rehab for another two months.
The Don't Stop The Music singer undertook a three-month stint beginning in November for anger management following his arrest for alleged assaulting a photographer in Washington, D.C.
At a progress hearing on Friday, a Los Angeles judge ordered Brown to return to rehab for an anger management and drug rehab program for a further two months before returning to court on April 23.
Brown was also diagnosed with bipolar disorder and post-traumatic stress disorder (PTSD) in facility documents read out at the hearing.
The document reads, "Mr. Brown became aggressive and acted out physically due to his untreated mental health disorder, severe sleep deprivation, inappropriate self-medicating and untreated PTSD."
Brown is still on probation for assaulting pop star Rihanna in 2009. His trial for the photographer assault case is set for April 17 in Washington.