#626 : Fix Oracle compatibility
(cherry picked from commit ef66b29)