Fix list rendering
Merge commit 'c514b0ea254c4920f681d646cbb20a1bec27cf38'