Fix Issue #136, InternalError on commit and reopen