#tomwaits back patch