Merge "Fix error in JobjectComparator"