570 dirty hack fixing duplicate symbolic names