fix history thing?