Fix issue #1769: Custom listings (broken)
Merge pull request #1770 from rarila/issue-1769

Fix issue #1769: Custom listings (broken)