#2353 - final adjustments
#2353 - typo