Fix looping checks
Release 2.0.2