Mistakenly disabled optimization