bug fixing Map