fix for block wait