Slight improvement in Map position problem