Update with fix for Giles' issue