- fix one to one issue