Issue 3561 fixed for +,-,*,/