Quick and ugly hack to see if this is the problem