Fix generator so that zero-offsets are not skipped