Added the fix for triggering hierarchical contexts