Fixed Issue #64.