Fix for ZEN-13662: fixed property id