Fixing check.
Simplify rewind points.