Fix the status updating