I think this fixes #322, but it would be good to confirm after the redeploy