Fix Issue #66