JFUSION-149 #comment yet another try =)