Fix strict_variables = true