Fixed Issue #70