Bugfix from HW6