Temporary, and ugly hack. But works now