add quick and dirty hack here