Fix to work with strict_variables = true