Webform Module 2.0 : Wrong upload folder for forms with multiple filesupload fields

[kartobi]

In a webfrom with DataTarget=Database and multiple fileupload fields, only the first file will be uploaded to the folder according to the FormId stated in DataTarget-Block. The following files end up directly in /shared/webform/
This is the behavior for the very first form submit.

For all following submits (when the FormId folder exists), all form files are uploaded directly to /shared/webform/

Tested with Webform Module 2.0

[kartobi]

Problem still exists in Webform 2.0.2