Fixed issue #172