Fixing the messing conditional