Another fix for this optimization