Addressing PR comment