Added canonical check