fix for BlockStore overlapping lock