Bug Fixed: Issue #70