Fix map callback not being called