Fix non-blocking bug