Fix status mapping