Vector&PolyBugs Fix