Address Jesse's comment #4