Address Jesse's comment #6.1