fix issue with mapActivity after organizing a code