Fix expression for variables