Fix status detecting