Issue #69 fix