Fixing role mapping