minor adjusting for #376