HACK: Fix corrupt list entry removal