fixed all error