bugfix 2 PR16

second bugfix for PR16