Fixing segfault.
More performance.