unbreak; this requires zavolaj's PR #29