fixes for 2301313 #6
adsress #11