Fix for history item generation