BaseManager fix