fix bug, ready to be 2.1 version