rolling back and fixing it