Fix for ORA-51 for master (moving from Authoring)

@wedaly @gradyward 

Waiting to see if tests pass