Cannot add Agents (in custom role) to Department

I cannot add all the Agents I have added into the system to the Departments that I want to. And I have figured out a work around (that I am not willing to make).

The only Agents available to select in the Edit Department screen are the ones that have the "Agent" role. It does NOT list those I have given a new Role I created called "Manager" that includes the Agent role in it.

Until this bug is fixed, it gives me two options. Either make all Managers only Agents, or give Agents more abilities in the system. And I do not want to do either of those things.

I guess there is one more thing, instead of using my new Manager role for my managers, I could assign them the built-in Admin role. But I really do not want to give them access to the Admin controls!