some mapping tweak