Fix crash; issue #959
Update submodules