Fixed Issue #74