#311 : Fix Oracle compatibility