Fixing an issue where waiters entered into a failure state erroneously