Fixing another segfault caused by the recent commit