Fix the position issue