origin and path fix