Revert "Revert "Refactors ff precision fix""

This reverts commit 6fe8c37009fff6d0c2288cbeb956af8e316e7e6f.