minor changes
#AM-169