Address Jesse's comment #2