Improve subscriber ready check

Most cases will be OK with this heuristic logic.