added hack to force history tests to work, we should at somepoint look into that