Trying to fix data context