[c12481] Fix a bug with vmap extraction