Fix for ExampleValues