Not really, but I just realized that this fix breaks this optimization.