fixed some offset