OS: SSS fix for mapping rules