Does this fix segfaults?