Hopefully fix unique property computation.