The files touched here need a bug fix which is applied with the following patch. Signed-off-by: Stefan Weil <sw@weilnetz.de>