Fixed for new Vector implementation