Is believed to fix a segfault...