temporary fix for changing data context