fix and bump to 2.1