ContextRework: FIXING RECENTLY-INTRODUCED REGRESSION
ContextRework: FIXING RECENTLY-INTRODUCED REGRESSION

arielm/new-chronotext-toolkit,neshume/new-chronotext-toolkit,arielm/new-chronotext-toolkit,arielm/new-chronotext-toolkit,neshume/new-chronotext-toolkit,neshume/new-chronotext-toolkit