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