fixup Vector implementation