Added Leave by click support