fix funky history passing, closes #35