Some error have been fixed