this addresses 1st case of #373