Improve the setting of current expression