Status check bugfix