updated to core change with EJRestrictions