Fixed bad event and early exit
Release 2.0.1