Added fix for recent mapping update [tracker #1647]