Fixed a bug, 2.1.1