Issue #166 - modify status check