Fix non-blocking problem introduced with 0.4.1