Issue #58 attempted fix