Once more, simplified patch