Fix wrong index check
Release 2.1.1