Extra fix of the same thing just to be extra-safe