Status bug fix