Bugfix on HW 6