CJ-1117

solve this problem on java side