Second try to fix segfault.