Issue #66 (fix)