removed segfaults