Small origin related fix