v1.1: be more strict regarding multipart management