prep for #100, helps for #113