#1748 Fixed hang in status checking