fixed issues in role 06