offsets bug fixed