Callbacks fix in maps