[BUGFIX] Final fix

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