Fixed canonical bug