Fix status once and for all