fix data controller bug