Fixed cvim bullcrap