Bug 3258 : Changed the order of condition for OrderedMap and MapNode,