Fixes stage1 saveStatement.
Merge pull request #459 from LearningLocker/issue/conformance-ryan2

Fixes stage1 saveStatement.