Fixed bug in canary