Fix position issue