Fixed Issue #64