Offset bug fixed