true, that means this PR needs tests as well, but again we are waiting for @fabpot for feasibility