Fixed Issue #193