Fix broken list take 2