rewind command crash fix (Closes #2)