@pjedrzejewski Have a look at #581.