Fixing it myself so SmillerNL doesn't kill me