An updated version of Runemoro's VanillaFix and also ported to the latest version