adjustments for #265