Fixed Issue #75