Fix bug introduced in the first very rough merge from dspace 4.0-snapshot