slight improvement to behavior noted in #650