Fix origin issue