fix with franco original
Revert "O3 Optimization"
This reverts commit 3f236a9cedb643406adde51db464af4b3f3d11d9.