Fix order the roles are added