Reverted previous commit [7438] which was only done temporary to have a test case with error for the training session. This version is now OK again.