in prep for #1620
in prep for #1620