Fix issue with origin field