m2.61 fix #1