should fix #172