Add Jesse's client fix