Fix error issue