Fixed Issue #69