Accommodate latest version of grape