use my fork until upstream is fixed