fixed the probles