FIX: Fix morph_map regression