Issue#776 performance opt

concerns #776