Fixed block overlap bug