Dai - fix some control