patched to allow non-multiform requests to work (no tests yet)