Fixes: #2313 Fixed listing base handling