Fix Status Check