This makes things work, but it does highlight another problem.