Fixed Issue #81