Address PR comment