fixed, with file uploads too