Fix for change in CanaryLib