fix defers