STORM-80 : Fixed the xfh file generation bug