Fixing status changes