Fixes uniques waiting bug