Issue #72 is fixed