"Fix" SIGSEGV
Refactoring