Added fingerprint check