Resolved #51, for good (I hope)