Fix CanaryLib/#1 ticket.