ref #633