fix SOC-4228