fix 0/1 and combining