fix expression scope