Fix highlighting position issue