Fixed for @Planefun's Successors