Fix the v-dir thing?