fixed some issued