Patch in #13 is working fine.