Fix weird issue in origin