Bugfix based on the morning meeting.