Fix HR implementation