adjustments to #398