First Version, 2nd try

bugfix