Multiple map compatibility issue fixed