Bug fixed: incorrect if removed