Issue#776: Optimise performance

concerns #776