correcting conditional code
correcting conditional code