Issue #157 Modify in uploader class