Changes for positioning problem