Fixed Issue #80