fix baseline call order