Fix for change in CanaryUtil