Bugfix  + history improvement