Okay I've pushed another fix. I can't promise it's completely solved yet but hopefully it happens less often now.
