Fixing origin problems