Re-added Leif's edit