commit
fix non-blocking stubs