Version 2 fix with Leveldb done right