Fixed swapping behavior for blocks that have dropped