I gang

Remove bugs occured after file transfer