Should fix #2094 (closed)
I didn't try to run this, I haven't setup a dev env yet for this.
cc @Sporiff @wvffle