Fixed Issue #172