Fixed Issue #66.