Use the same FEROLs in any case

Fix the canonical configuration to always get the same FEROLs  regardless if we use 1 or 2 streams.