fixing bug with data context