Fix on status changes