Last bugfix for history order...