Fixed bug with blocking