fixes for history