Fix role factory