Fixed bug with roleswitcher