fix mapping changes