Emergency fix