2 nd bugfix