compatibility changes for latest catalog, thanks to M.Reimann.