fix config and mapping