Small bugfix
Merge remote-tracking branch 'origin/research/hz3' into research/hz3