Matching made further. Trying to fix segfault