setup for #662