Fix SIGSEGV after previous commit