Made one click execution safer.