fix breakOut + map