Dirty hack to overcome name problems