CRITICAL FIX for multicontext security