fixes for #289+