Fixing snapsho check logic