Trying to repro #615