keep context current, fix bug #16