#??? OracleGateway fix