[fix] Segfault is really fixed this time.