MOE-05: Fixes scp flushing