'Fixed' a bug which could occur in the future if the datasource of CV
would be changed