fix status handling