Another fix to blocking, appears to now work