COMP: fix core dump