Checked mode fix