Make it work with the recent spoon changes.