Removed another Segfault.