bug fix after Ana and cluster lipid (still in progress)