Final change

Slightly change the codes to identify where the function is broken.