Modify FloatOut to fix Trac #4237