fix issue with fadad