Update to match latest commit

to match changes in 3ffec90a6bbe0bda5d2cc578a91b37302c9f05ff