Another small fix for non-blocking protocol. #0