Some error is fixed