Thanks, it works. But we have too many automation scripts to be changed. Looks like no other option other than changing them to When or Then