Fixed status handling