Fix to work with AccessControl