2.4 # Address comment in PR.