fix of issues https://hypernews.cern.ch/HyperNews/CMS/get/swReleases/3982.html