Minor bug fix and bump to v2.0.2