Incorporated comments from Ulrich Wiehe.