Fixing a vulnerability identified by @ixos