Fix Yardstick failure