preparing for #61