fix crashes when clicking MAP with single session