Close #1806 map crash on kitkat