Patch to fix build without optimization