FS-6150 --resolve cool find