adjust to jcr changes