Fixes #13579

Tested with rygel.