corrections on fix for JERSEY-1931