JBEHAVE-1008:  Applied patch from  Daniel Kolman.