Fix for history