Fix Issue #69