fixes wombat
Merge branch 'battle-test'