fixed ifthenexp
merged