Fix bug VAS-3 to VAS-8