BUG 2411: removed extra condition to reset expression value