HR-325 and additional fix