Fixed some condensing bugs