Sorry for the second bugfix pullrequest