Add extra check to profile finding