COMMON: fix map bug