fixing troubles with Maps. Crying.