adapt to latest dui changes