Some offset bug fixed