Fixed Issue #78