Fix bug with 'origin'