Still trying to fix if condition