Fix annoying blocking issue