Added escape hatch