Fix to BC class mapper