Temporary workaround for the segfault