fixed: JFUSION-70