Hopefully fixed history issues