Dirty hack in copy class for now