Undefined fix #1347