Merge pull request #739 from ryantsai/codex/fix-issues-735-737