Fix for role assignments