Block fixes

Oh, right, the diff confused me, didn't see the condition above. Sorry for that.