Try to fix the #665
Now it just crashes in a different way