#691 & maybe #954


Signed-off-by: Peter Kriens <peter.kriens@aqute.biz>