canary bugfix