Fixed originBy bug