Second try on fix. First guess was apparently wrong.