Fixed Issue #68