Fix Yard 0.8.5 incompatibility