Temporary dirty hack