removed the workaround for the segfault