Fix the Octopus to not segfault anymore