Jeff Bug fix

Note I can't run this locally, so I can't test it, but I think this will fix the Jeff bug.