[BUGFIX] v3

Change-Id: Ie0d7c6be9a8acdaa5ee5e87937b8dfdac9486e73
Reviewed-on: https://review.typo3.org/25861
Reviewed-by: Georg Ringer
Tested-by: Georg Ringer