fix for ctl-1846 + last context call fix