Fixing bugs that rewinder stop at wrong version