Resolved with #149