Fix problem with expressions