Fixed Issue #67.