This is an ok stopgap measure for fixing these examples.