fixed some err