try to fix map bug