Bug fixed(missing codes)