SSP-2622 Fix object/primitive type mismatch