Fixing initial history bug