fixed some issue