first beta3.8: squad fix