Pull request 194 lps 34617

please test my changes