Re-fix fp64 warning avoidance