fix legacy mapping