Fix Issue #23. eserte++