Fix issue with expressions