fix bugs in removing heart