Fix re-map bug