Try to fix history still broken on OSX