Resolves clickOnUpload situation
Fixes merge