Image upload bug (wip, check with robert)