Fixed Issue #79