fixed some additional issue