Fix for initial-data (roles)