Fixing issue #45 - The map sometimes loads without a marker