Reapplied revision 1.19 fix that was removed by the previous commit.
Reapplied revision 1.19 fix that was removed by the previous commit.

tiborsimko/invenio,tiborsimko/invenio,inveniosoftware/invenio,inveniosoftware/invenio