Fix bug 1003286 - map is at times empty
Merge pull request #173 from almossawi/master

Fix bug 1003286 - map is at times empty