HR-327,HR-326 and HR-328 fix