[Fix] Big Fix to kill bug