fix a bug and bump to 2.1