Fixes VS num instances assumption