Fixed non-blocking issue