Trying to fix the history, at least something. Still does not work as expected