Handle it better when umd waits trigger during cbs.