Repaired VS solution