Fix the 'Origin' function