Fixed for latest canary