Address comment provided by Adam Roach.