fix using for expressions