fixed some error