Fixing map class