Fix for Oracle QA + MT