major fix in SS AoS