Fix for cvs