JBEHAVE-1007:  Applied patch by Daniel Kolman.