Aggro bug fix