Fix status issue