*8543* Fix broken context fetch
Fix behavior w/o context