History bug resolve