Fixed bug with res/data