fix for JERSEY-1931