SW-17- fixing source routing