This may fix the live problem, though I have not reproduced it locally.