fix to SS and OS