Fix status handler