Removed segfault