working on #108: RIDs are not updated after commit
working on #108: RIDs are not updated after commit
closes #108: RIDs are not updated after commit