Issue 573 and hbz 30

See #573 (and a bit of hbz/lobid#30).