Quick fix for Maps