fix data controller