Use changes from errbit/errbit#529 (pr)