MB-35 #comment fixing line swap bug