A tweak to make the link lists work