Fix (1) for #633