Make detect check more strict