huge fix with lists