fix to use original Vec
fix to use original HashMap