Temporary commit.

Still segfaults. Why?