Fix for DataContext