Fix for multi-granule offset bug (failures William found) [978]