Fix problems in blocking