Final presentation - bugfix