- fix and origin normalization issue