* fix concurrency issue * address review comments * address review comment Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>