Merge pull request #423 from TheBlueMatt/mapalreadyaskedforfix