Fix NoCan bug