Attempting to fix segfault.