Corrected bug with optional actions