Added support for offsets that overlap two blocks