FIXING IF