fixed name clash in opt