Addressed comment in latest change.