#401 - Strengthening mapid check