Use fixed defer library (vierbergenlars/defer#1 fixed)