Fixed bug #172