Fix to be able to work with CDH v2 still...