Fixing Vector class