Remove Vector and fix a bug