Fixes search/random