Fix status logic