Fix status overwrite