Manage role on low role gives you access to everything between if you have multiple roles

I'm running a small 500 users server where we give users rank based on their ingame rank, role for hidden text channels for each voice channel and so on.

On the bottom of the role list i have two clan roles, bottom is member and second bottom is team admins who has Manage Roles enabled. 

Problem is that since they also have a rank-role that is higher up they are able to manage everything between rank and clan role. 

I would love this to be changed so you can only grant role below the role with Manage roles active, not from highest role of users..