fixed potential 'null' output in 1.3.5/6 target