List-based data structure fixed for 0.9-pre (fcca394)