fixup! added mapping table