Bug correction

Some bug has been corrected