Fixed Issue #66