Issues #172 and Issue #358