fix static expressions