Hot Fix for Change in CanaryLib