Issue #216 Fixed some bugs