Add option to stop automatic transitions