Another fix to assertion flow.