Quick and dirty hack