TUP-2164 : fix problem with multiple properties