fix list break & add stack macro implemention