Fix link list structure. Fixes #472