Fixed map callback issues