another fixes
history support