Hack to fix examples...