* modified and bug fixed as test enable to be evaled