Dirty hack that works