Fixed bug with empty listing