fixed current list stuff