Fix bug 1003286 - map is at times empty