Fixes: #2409 Improved list handling