Fix the result of "optimization" :)