Changes proposed in Mauro's comment on JBEHAVE-754