A fix for #172