merge in an additional change from 909ffb3e