This is adressed in #375