Readded fix properly for 16v16 SB