Fix role dependency issue