Fixed Issue #92