r796

ticket #172