Fix Flat-UI bug