Potential fix for issue #172