Final change

Slightly modified the codes to make it identify where the function is
broken.