Another emergency fix