Fix for MUON/mapping