Chris Brown has been ordered to stay another two months in the anger management and drug rehab program he entered three months ago.

According to reports, although Brown's probation officer reported the singer "continues to make great improvement" in dealing with anger, stress and drugs, the judge decided during a hearing that he can't go free yet. He has to be tried on an assault charge in Washington first.

His legal troubles began five years ago when he beat then-girlfriend Rihanna in a rented Lamborghini on a Hollywood street. He pleaded guilty to felony assault in June 2009, which resulted in a sentence of five years of probation and 1,400 hours of community labor.

The judge has revoked Brown's probation twice in the last year, most recently because of his arrest on a sidewalk near the White House after allegedly punching a man.

Brown voluntarily entered a rehab program a day after being released from a Washington jail in October, but he was kicked out a few days later for "throwing a rock through his mother's car window" after a family session at the center, a probation report said.