bring inline with last j2.5 version.