Fix role generator