Fixed ORA-740
Merge pull request #555 from edx/grady/ORA-729

Fixed ORA-740