Fixed that rollback glitch