Reverted back 'updateContext if' in ContextAttribute