Simple search and cross-platfrom fix