Another Bug-Fix in the contrib project.