Fix status update issue