Fixes linker warning. Refined search