r808

ticket #191