map bug fixing