Fix for issue #172