Fixing issue when Element is used as selector for 2373