Fixed Issue #173