more adjustments for #353