Update to match latest commit [b85bdff]