Fixed dcbasename as well (to be removed, though).