Fixing problem with wrong VS ids