Good memory!

I still like @david0vich's version better but lately I didn't receive map updates and with this version I did.

Thanks for answering.