Fixing ORI bugs
`